upstream/16.0+dfsg1

Balint Reczey

@rbalint

d4731829 · Imported Upstream version 16.0+dfsg1 · Feb 22, 2016

Upstream version 16.0+dfsg1