Upstream version 20170109
This tag has no release notes.