upstream/20160429.b31155b

Ben Hutchings

@benh

f79fa4af · Imported Upstream version 20160429.b31155b7 · Jun 30, 2016

Upstream version 20160429.b31155b