Merge from upstream.
authorDavid Given <dg@cowlark.com>
Tue, 20 Oct 2015 17:23:28 +0000 (19:23 +0200)
committerDavid Given <dg@cowlark.com>
Tue, 20 Oct 2015 17:23:28 +0000 (19:23 +0200)
commit2ae14b680fcd9e35772f63169d301aa25260fdd7
treec8e304d473b93b8d1894e1d948b737cd083a94b3
parentb8c15ebdd227ecc44ce3f594bd1fc188e1984dfd
parent4512abd306cdd57bf52e962b9f6cd33169dba4ef
Merge from upstream.