upstream/2.8.6dev18

Axel Beckert

@abe

1a9fbb01 · Imported Upstream version 2.8.6dev18 · Feb 12, 2015

Upstream version 2.8.6dev18