Merge tag '2016.8.3' into debian/unstable

2016.8.3