Merge tag '2016.12.1' into debian/unstable

2016.12.1