Merge branch 'reset/explicit-api' into reset/next

This commit is contained in:
Philipp Zabel 2016-06-29 23:39:52 +02:00
commit af3e1629c8