Merge tag '2016.8.3' into debian/unstable

Upstream version 2016.8.3