upstream/1.17

Michael Prokop

@mika

4503d76c · Adding upstream version 1.17 · Nov 04, 2013

Tagging upstream version 1.17