upstream/1.16

Michael Prokop

@mika

479a58f8 · Importing upstream version 1.16 · Jun 11, 2012

Tagging upstream version 1.16