upstream/1%20151212

Iain Learmonth

@irl

b576aa4a · Imported Upstream version 1:20151212 · Dec 13, 2015

Upstream version 1:20151212