upstream/1.36+svn2202

Simon McVittie

@smcv

eb77a4c8 · Imported Upstream version 1.36+svn2202 · Nov 28, 2011

Upstream version 1.36+svn2202