upstream/1.3.0_20150127

Maximiliano Curia

@maxy

6d859e3f · Merge remote-tracking branch 'sshfp/master' into upstream · Jul 22, 2016

Upstream version 1.3.0~20150127