upstream/1.0.1
4a5bd70b · Merge tag 'v1.0.1' into upstream · Dec 28, 2016