Merge tag '2016.4.1' into debian/unstable

2016.4.1