Merge tag '2016.4.2' into debian/unstable

2016.4.2