upstream/0_20151017

Ondrej Sury

@ondrej

d04656f6 · Imported Upstream version 0~20151017 · Jul 13, 2016

Upstream version 0~20151017